treewide: Fix weblate conflicts
authorHannu Nyman <[email protected]>
Mon, 21 Apr 2025 19:11:19 +0000 (22:11 +0300)
committerHannu Nyman <[email protected]>
Mon, 21 Apr 2025 19:11:19 +0000 (22:11 +0300)
Merge remote-tracking branch 'weblate/master' and fix conflicts.

Signed-off-by: Hannu Nyman <[email protected]>

Trivial merge